[IMPORT] Intégrer les champs d'import lors de l'installation d'un protocole #398
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nX-SI#391) * Fix edit map mode * Reinit leafletdraw config
* VESION and requirements.in * Docs * Changelog 1.0.0 / complément * Update README.md * Update docs/changelog.md * Bump GeoNature * Add postgis ltree extension * Suppression données orpheline synthese * Use geonature 03b_populate_db.sh script * Changelog --------- Co-authored-by: Camille Monchicourt <[email protected]>
…tions/gn_module_monitoring into feat/import/install-protocol
|
Il faudrait rebaser la branche de destination sur DEVELOP, car là la PR semble ajouter des commits qui sont liés à d'autres évolutions récentes de DEVELOP. |
jules-jean-louis1
changed the base branch from
feat/import-monitoring
to
develop
* VESION and requirements.in * Docs * Changelog 1.0.0 / complément * Update README.md * Update docs/changelog.md * Bump GeoNature * Add postgis ltree extension * Suppression données orpheline synthese * Use geonature 03b_populate_db.sh script * Changelog --------- Co-authored-by: Camille Monchicourt <[email protected]>
added 7 commits
December 23, 2024 16:41
…tions/gn_module_monitoring into feat/import/install-protocol
jacquesfize
reviewed
Jan 9, 2025
Comment on lines
21
to
25
| from geonature.core.imports.models import BibFields | ||
| from geonature.core.imports.models import Destination | ||
| from geonature.core.imports.models import Entity | ||
| from geonature.core.imports.models import EntityField | ||
| from geonature.core.imports.models import BibThemes |
There was a problem hiding this comment.
Suggested change
| from geonature.core.imports.models import BibFields | |
| from geonature.core.imports.models import Destination | |
| from geonature.core.imports.models import Entity | |
| from geonature.core.imports.models import EntityField | |
| from geonature.core.imports.models import BibThemes | |
| from geonature.core.imports.models import BibFields, Destination, Entity, EntityField, BibThemes |
jacquesfize
reviewed
Jan 9, 2025
| Destination: L'objet Destination inséré ou mis à jour. | ||
| """ | ||
| existing_destination = ( | ||
| DB.session.query(Destination).filter_by(code=module_data["module_code"]).one_or_none() |
There was a problem hiding this comment.
Suggested change
| DB.session.query(Destination).filter_by(code=module_data["module_code"]).one_or_none() | |
| DB.session.execute(select(Destination).filter_by(code=module_data["module_code"])).scalar_one_or_none() |
jacquesfize
reviewed
Jan 9, 2025
Comment on lines
532
to
533
| destination = Destination() | ||
| destination.from_dict(destination_data) |
There was a problem hiding this comment.
Suggested change
| destination = Destination() | |
| destination.from_dict(destination_data) | |
| destination = Destination(**destination_data) |
jacquesfize
reviewed
Jan 9, 2025
| DB.session.commit() | ||
| return existing_destination | ||
|
|
||
| module_monitoring_code = DB.session.query(TModules).filter_by(module_code=module_data["module_code"]).one() |
There was a problem hiding this comment.
Suggested change
| module_monitoring_code = DB.session.query(TModules).filter_by(module_code=module_data["module_code"]).one() | |
| module_monitoring_code = DB.session.execute(select(TModules).filter_by(module_code=module_data["module_code"])).scalar_one() |
20cents
reviewed
Jan 13, 2025
|
|
||
| fields.append(create_bib_field(field_data, entity_code, field_name, id_destination, json.dumps(field_data))) | ||
|
|
||
| if field_data.get("required", False): |
There was a problem hiding this comment.
Les champs additionnels peuvent être requis ?
added 2 commits
January 16, 2025 16:37
…refactor function, add distinction between generic and specific field
jacquesfize
reviewed
Jan 17, 2025
| Args: | ||
| module_data (dict): Données de la table gn_commons.t_modules du module à importer. | ||
| """ | ||
| try: |
There was a problem hiding this comment.
Ajouter db.session.begin_nested(). Cela permettra d'annuler toutes les transactions effectuées si une des requêtes échoue. https://docs.sqlalchemy.org/en/20/orm/session_transaction.html#using-savepoint
| Destination: L'objet Destination inséré ou mis à jour. | ||
| """ | ||
| existing_destination = ( | ||
| DB.session.execute(select(Destination).filter_by(code=module_data["module_code"])).scalar_one_or_none() |
There was a problem hiding this comment.
Suggested change
| DB.session.execute(select(Destination).filter_by(code=module_data["module_code"])).scalar_one_or_none() | |
| DB.session.execute(sa.exists(Destination).where(Destination.code ==module_data["module_code"]).select()) |
Comment on lines
+604
to
+608
| Args: | ||
| field_data (dict): Données du champ | ||
|
|
||
| Returns: | ||
| str: Type de colonne PostgreSQL |
There was a problem hiding this comment.
De préférence au format numpy, https://numpydoc.readthedocs.io/en/latest/format.html
Comment on lines
+834
to
+837
| if DB.session.execute( | ||
| select(EntityField) | ||
| .filter_by(id_entity=entity_id, id_field=id_field) | ||
| ).one_or_none(): |
There was a problem hiding this comment.
A remplacer par une requête exists
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[IMPORT][MONITORING] IM_IMPORT_01.0 - Intégrer les champs d'import lors de l'installation d'un protocole https://github.com/orgs/PnX-SI/projects/13/views/6?pane=issue&itemId=83656221
Intégration des champs d'import lors de l'installation d'un protocole
Ajout dans la table
bib_destinationsbib_destinations.Récupération et insertion des entités
config.jsondu module.bib_entities.Gestion des champs spécifiques et génériques
bib_fieldsetcor_entity_field.Création de la table d'import
t_import_{protocole}.gn_imports.